Removed my horrible violation of the Dependency Inversion Principle