Refactor.
Update requirements.txt.
Remove some useless code.
Bump version.