Move Role splitting logic into Facade, remove whitespace from split role names