clean up
clean up
further refactor branch with homog. ens.