Write some comments and reorder fields