Code tidy up
Version bumped up to 0.0.2