refactored data
done refactor