changes from iteration review
refactor: moved use of strategies