A whole bunch of consistency and documentation tweaks, consolidate code styling