Explore refactor