Update description and change variable names