Refactoring
Minor
Always simplify the polygon

This solve the perf problems caused by an earlier refactoring