Fix whitespace and capitalization