Refactoring
Improved readme