Tidy up scripts