General code cleanup Pt.3