V0.0.2

What does this PR do?
---------
Refactor the first version to use better style