Updated variables to match general formatting