Check before peer is added/removed multiple times
Formatting