Cleaned up a bit dataItem class.