headerfile: code cleanup