Refactor common stuff into base class
Refactor strategy classes to remove duplicate code