Fixed a refactor mess
Readme update