Refactoring and spring cleaning