Refactoring.
Update README.