KAZOO-1901: Use list comprehension