Changed vars to consts