Cleanup, add range restriction