Played with Provider
Minor clean up
Played with Provider.get()