Refactor header()

Remove hardcodings, code cleanup

Change-Id: I9243a9451300e26fa75dd8f4dc3119a16b27eab1