Clean up capitalization