Clean and improve a lot the System F ω implementation