More code cleanup
PEP8 + rename handler to dbushandler