Clean up spacing