Cleaning and rearranging some attributes.