Some refactor.
Update README