Reformatted more files, made changes I forgot about.