More changes to script to conform to dartlang format