squash: working on Peers
squash: stylistic stuff