PEP8

I cleaned up a bit of the code according to PEP8 standards.