some lint fixes
use individual providers