Avoid recreating the data detector
Style conformance
Merge pull request #459 from hpique/avoid-recreating-data-detector

Avoid recreating the data detector