Some cleanup and documentation tweaks