Fix some styling per review by @micfunk