Refactor titles