Refactoring attempts