Bracket alignment and field name fixes