Corrects other format issues, and also removes three files from git.