Update data import

Data import easier to read, more streamlined now