Refactoring - Replaced each method with inject