Refactor dive site listings