Refactoring less