some more reformatting