justj-14 DEV: @Inject annotation support: Refactoring