Update README.md
Some rafactoring