Added comments to the rest of the refactored classe::