KAZOO-2105 more formatting