Added comments
Code harmonization