Refactor full title