Some clean up of data range handling