Refactoring: reducing lines per method