Simplify and shorten header