refactor into proper role