Made a couple of comment changes/restructured the code
Rewrite and consolidation of scripts