Update for format scripts moving to core (#2757)* Update for format scripts to core move* Minor cleanups (commit: aff0f89)