KAZOO-537 formatting
KAZOO-573 formatting