Refactor survey methods