hw5 cleanup and commit, should be final