Even more code beautification in the roles JSON