Code tidy
v0.0.9