made variable names consistent