Consistent CamelCase and grammar cleanup