Refactor strategy pattern - concrete classes and lambda