more type/header clean-up