Code refactoring
Update README.md