WL-2652 Sort tabbing and duplicated code