PEP8
Added which utility from twisted for #529
Refactored some poorly named utility methods
PEP8
PEP8
IDE updates only