Minor code layout changes (editorial changes only)