some code cleanup
+PropertiesLoader +ProviderNameUtil (not used yet)