Changing to more stylistically pythonic.
PEP8 compliance progress.