Start removing the explicit unit clause structures.
Removed the explict unit clause structure completely.
Code cleaning.