Major code cleanup. All generic Heading methods are moved to the AbstractHeading class