refactoring less