Minor attempts for style fixes.