small cleanups/tweaks