code cleanup, added evalue flag.