eyetribe refactor