pep8 cleanup
Merge remote-tracking branch 'origin/rpc_handlers' into rpc_handlers