MainScript cleaned up
Merge pull request #2 from datadazer/MainScriptDraft

MainScript cleaned up