Group legacy data and make entries more readable