Cleaned up code
Merge pull request #36 from mikemases/Script_Cleanup

Cleaned up code