Refactored survey model a bit