Sort out that spacing