Refactor/minor survey refactorings