Refactor title helpers, fix some typos