cleanup, add opt to type table