some misc update for avbot

this is some misc update for avbot, basically  code clean up