Cosmetics
Only recover topology if asked
Extract method