Cleaned up formatting changes in common files.
Further minimized changes to originals.