Make Advisor evaluation code easier to understand