[cleanup] Reorder properties (template too)