More headers and cleaning