data explorer fix/code refactor