A bit more reformatting