minor cleanings and comments