KAZOO-2105 formatting