Refactor advice

Improve advice perf.