clean-up, mostly formatting