changed some dumb variable names