Add more consistent spacing