formatting clean-up and tweaks