Further revise spacing