Simplification et corrections