Code refactor
0.0.5