picky formatting cleanup