code cleanup + tweaks pt.2