[cleanup] change task header change to be more appropriate
additional code cleanup