make headers more swift suitable