Refactoring for using Ninject