Removing some extraneous fields, and doing some preliminary formatting #1518