Clean up update to sync with the solution introduced in L3.