refactored data view