Homework 04 complete, but needs cleanup