Formatting tweaks.
Merge branch 'UM_local'