improve property order