Code standards / Cleanup / Minor tweaks.