Some more cleanup
Capitalization is hard