Tidy up calling scripts