Refactoring code, README.md