little refactor on the data load