PEP 8 cleanup and small bugfix causing FDShim not to die