PEP 8 enhancements
PEP 8 on all controllers
Merge remote-tracking branch 'origin/master' into sps