minor cleanup of role history design