Refactor code to make Titles simpler