Refactor - Make checking for win more efficient