Refactor with Work role
cleanup