Cleaning up homework 1 & 2