Code Cleanup + Tweaks pt 1