more spacing cleanups