Eliminate ROLE.length
Cosmetic changes
Fix typos