Clean and update comments