KAZOO-2092: formatting, tickies