refactor assignment and occupation forms