Small refactor in Header
Small refactor in Header

pdswan/rom,dcarral/rom,rom-rb/rom,pvcarrera/rom,endash/rom,rom-rb/rom,vrish88/rom,denyago/rom,jeremyf/rom,dekz/rom,kwando/rom,pxlpnk/rom,rom-rb/rom,cored/rom,Snuff/rom