Slightly improve comments and update some whitespace. No code or logic changes. Signed-off-by: Jeff Squyres <jsquyres@cisco.com> (cherry picked from commit 8ed1d28fb4afcc54bc4d093bfcc53acae3d2fa58)