lots of reformatting
minor