lots of formatting corrections
clean-up commit