Ninject refactoring #1