LPS-38713 - If there's only an element in site roles and teams, remove the "comma"
LPS-38713 - Source formatting