Refactor and tidy up.
Release 0.0.2