[TASK] reordering of a few properties