moving data dict to reduce repetition

.