Fixing some code I changed unecessarily