Refactor with title helper