[cleanup] Reorder properties