Cleanup and actually using IoC