Clean up assignment 2 a bit