MOre refactoring