Run.sh Code Cleanup