Removed unnecessary recalculation