Some file formatting and minor renaming.