start cleaning up zoom code