code clean-up
v0.2.3