Refactoring.. Injection null