completed assignment 1.1
some cleanup