Update README.md

Some refactoring