Refactor title