Various tweaks, cleaning up and style changes
Various tweaks, cleaning up and style changes