Cleaning up spacing