More formatting improvements for PR #906

Hi Assefa can you merge these into your fork repo so they become part of your PR? Thanks

Tim