use simple range specifications, other cleanup