Commalist refactor