Refactor inline headers