Script cleanup
Merge pull request #539 from skler/patch-1

Script cleanup