Some evaluation code reshuffle

No functional change.
Merge pull request #10 from mcostalba/master

Some evaluation code reshuffle