evaluation board refactor