headers conversion more like first class

- stay classy