Small refactor
Release 0.2.1