Refactor. Update Readme.