Refactor and cleanup gossipsub