moved vars to consts