Tidying the P2P section