Refactor strike evaluation again