Changed evaluation method and removed extra code