Correction and style fixes

Small correction and style fixes.