tweaked variable names