further data formating cleanup