Clean up spacing a bit