More readability updates, replaced participants and users with a user dic