chore(di): Some slight refactors