Refactoring factory before introducing actor/adapter library