v0.1.2 code cleaned
v0.1.2 cleaned code