code clean-up pt. 1