Clean ups and marking TODOs.
Clean up - move towards constructor injection.

Makes the future move to auto wiring easier.