Finished initial reformatting