PRINCE: Script update and clean up