Refactoring; other