HW7 cleanup

unit tests still don't work
cleaning this up