tweaks + cleanups
tweaks + cleanups