Try and simplify desugar module (if possibe)

[afsalthaj]

desguar module code base has grown and there is now room for improvement - in making the logic more intuitive. More details to follow