Minor neatness changes.