Refactor coding style
v0.1.2