v0.2 - code cleanup