Overall clean-up of the code

[mgarbellini]

The code needs an overall clean-up, mainly by tackling:

• Poor commenting
• Function implementation
• Nomenclature/terminology