More variable name mistakes and removed unecessary arguments