moving data dict to reduce repetition
Merge pull request #2 from multikatt/move_datadict

moving data dict to reduce repetition