Simplify headers