Clean up gnarly angles