Clean up of script
Merge pull request #2 from garwedgess/patch-1

Clean up of script