F# code clean-up 2