renaming and reformatting