Before refactoring