Changed syntax of headers to be more header-like