Review and clean code \exploreviewcontroller tightened up