code cleanup before v0.1