v0.2 code cleaning