some more reformating