Fixed ugly variable names