F# code clean-up 1

Trying to improve the style
F# code clean-up 2