minor cosmetic fixes (including :%s/\s\+$//gc)