Cleanup code, bump version to 0.0.2