adjust code formatting
fixed warnings, removed duplicate provider store in builder