Tidy fuel_header a little