Refactoring classes that do too much