Refactoring + Update README.md