Heading clean up