Clean up the angular a bit