Doc block cleanup and minor tweaks