All tests pass with refactorings
updated readme