Code cleanup. Pt. 1.