fix a typo in the name of module "ModesConversion"
sort users by team name
code cleanup