Refactor survey service spec