slight reformat