PEP8

A few small changes here and there to adhere to PEP8 better. (Having mixed camelcase and _ seperated names in the same class is a pet peeve of mine :) )