Reorganizing header a bit