sort class fields
add missing comma