spacing cleanups