Fixing contract gen when arg is a map destructuring form
Cleaning code