Refactor.
Update readme.