Renames, minor formatting