cleanup, and a little script to fix capitalization