code improvements in DataSourceInitializer class