minor formatting tweaks
Merge commit '88a654007a992205417114ae0dd9f7db8bba0b03'