Further cleanup and fix field order.