KAZOO-2505: formatting updates