Refactor to use spot from for loop