made variable names more consistent