Some renaming and formatting.