order header and make it more readably