Cleanup, move default range declaration