refactoring, removed service layer injection