Cleanup helpers, refactured and covered with tests. Bump to version 0.2.1