headerText code cleanup