[OCD] Style and whitespace changes