formatting cleanup part 2