Adding heuristic
cleanup