Make spacing more consistent