Clean up loop in DefaultRectangular and update comment