Clean up and update comments