Changed unneeded variables to constants