Removed unused variables. Light refactoring for clarity’s sake.
0.1.7 Slight refactoring.