Script Cleanup

Special thanks to @jpiasetz. Doing testing now.