Explort tool bug fix and refactoring.