Refactoring, adding some spring injection