refactor - added data scrubbing