Adjust the order of the company info fields, remove rendundencies.