cleanup and PEP8
Cleanup and PEP8
Regex for roles, don't modify roles when adding