Clean up
fix diff style