Just some more cleanup.
Conforming to PEP8 styling standards