Add and update comments to the methods and code