Fix up some capitalization and spaces