clean up zoomer code