Cleanup range component for issue #10