Revert "refactoring peer"

This reverts commit cc2bacc3ea5dc702c1918baf5ed52f7e8ecdea79.