Small cleanup of header and Filter