Refactor dive site index