refactor wormhorse - allow deletions - fix pep8 warnings