Refactors so that Cliques#Edit also works