Additional cleanup on title