STY: Minor stylistic/PEP8ish changes