- abstracted the role matching

Now I have the role matching in a single responsibile function just to
keep things clean.