renaming and formatting (probably