Format update

Split expressions and expression list into different groups