Changed a couple of vars to consts