Started cleaning up some of the code
Cleaned up a lot of code, made it more PEP 8 compliant, increased test coverage