cleaning
fields: renaming attrs, cleaning, and rearrangement