Refactor Role.php