#HE-2 some code structure fixes(header, subheader)