- some more reformatting