Header cleanup :pencil2: