Added comments to the remaining classes