Updates to script-python interface
Cleanup