Refactor Strategy code