Applying Herve's suggestions.