Minor enhancement on header function