comment and formatting clean-up