smaller width, small clean ups