Homework 08 complete, need cleanup