Tighten up role section; remove superfluousness