Took care of a few PEP8 things.

Just rearranged a few things to be in line with PEP8 a bit more.