Refactoring.
Updated README.md.