PEP8

Re-factored most of the code to follow PEP8 guidelines.