Improve automatic simplification