Title refactoring