FIXED: find_span bug
CHANGED: refactoring