KAZOO-2318 formatting