Started small refactoring
Refactored
README fix