Cleaned up format of roles