data explorer fix/code refactor
Merge pull request #197 from benitoro/master

data explorer fix/code refactor