cleaning up hw2 again