Sort out spacing