Clean up some general spacing for readability