cleared up variable names