General code cleanup Pt.2