Clean up angle recalculation