fix more spacing, version 3 cleanup, and more common cleanup