Tidied up some of the edited files.