Formatting improvements

I think the one import the use of format make a difference in clarity.