Format changes and minor tweaks