Minor refactor for titles