refactor executable headers further