Some cleanup before submitting Assignment 2 as Assignment 3 for 70%