Refactored a bit
0.0.1