fixes to the formatting
merging merges