cleanup, evaluation function tweaking