Is all this reformatting necessary?  Would be better if the only changes were those that you're intending to make.