making some OCD stylistic changes