remove beginning newline, comment set -x
refactor more to remove duplicate code
fix cleanup cmd
remove runtime import
Merge pull request #2 from hopkinsth/master

more refactoring