Clean up spacing and better defaults