few corrections
refactoring injection