edits and minor code example cleanup
compacted multi-line method calls; made type checking pep8 compliant
compacted multiline method calls; simplified timeout calc
Merge branch 'cleanup'
removed --health; added --delete