cleanup
more cleanup, titles are correct