Better way of using headers