Peers Monitor refactor