Clean-up and more functional script.py