Clean Up Dependency Injection

[CianLR]

@devoxel mentioned it's a bit awkward the amount of DI going on, logger having to be injected into everything for one. There may be a nicer way to handle these things, one of the suggestions was to use class variables instead which might work.