general cleanups/refactors