refactoring and things