Refactoring smaller things