Minor cleanup, mainly to fit the content into 80 cols