Refactoring: Trying to conform to short methods