cleaned up homework 1