Code clean, use enumeration for all Collect survey annotations