Improved simplification