Added simple data reformatting