Code Cleanup: Pt 1 / 3