Minor refactoring
PEP8 all the things\!