improve readable
v0.2