Minor Edits, Refactoring and Net New Script

Some things for your consideration.