performance boost
evaluation improved, cleaning up in tests