OCD - formatting cleanup