Refactor.
Update README