Refactored non-test code
Readme text