Refactor span methods