Refactoring injectable to use functional obj construction