Heading block refactor