Better organization of headers