Refactoring, Restructuring, make the whole thing less dependant on a single data provider