Clean up logic for non-strided ranges and remove some brackets