[vizMcLarena] refactored choir