Improve -info display
Refactor clipping code