PropertyProvider class loader

+little bit of cleanup