remove unused fields and make final variables, change order of fields so mutable state is together