Clearn up and normalize scripts