cleanup definition, using results view whenerever possible