More cleanup and more title types