Homework 07 complete, need cleanup