Some more cleanup for W08 Assignment