Refactoring...

all tests are green