Refactoring

Refactoring a couple of things.
0.1.8