Add title and refactoring