Changes to format and update scripts