Refactoring more