Refactor is-draw