Updated Readme
Cleaned unnecessary code, improved test coverage