KAZOO-2471: formatting updates