Cleaning up capitalization