Update README.md & Refactoring