few format fixes
Merging in format changes from both ends