ML-36 PEP8
Fixing up code to be more PEP8ish