Refactored data into seaprate file