Fix advisor vocabulary
fix flake8 warnings