Cosmetic cleanup to a few roles files