#5 refactoring in peer class