Cleaning up code
v1.0.7
v1.0.8