refactored data