Added comments to properties and methods