searchVC code cleanup