simplifying
refactoring
simpler
oops…..
refactoring
tests almost pass
oops, boo-boo