Refactoring
Improved Readme