Some more reformatting