restore defaults function + some refactoring