KAZOO-hackathon: fixed from code review comments