Clean up things by moving formatting script

Change-Id: I18a0af38c9f39e80b37ce2a0245fbfc182f34d7a