Further tidy up. Renamed from line to entry_data as it has more meaning