Refactoring: Simplify a method