Cleanup spacing a bit