Refactor/visit table minor refactor