Cosmetic changes + handling of interval & range