KAZOO-590: refactor with karl