25 - some additional basic reformatting