PEP 8 compliance to make working with other python devs easier per #13
Refactored to save a bunch of time and trouble per #15