Refactor unit-hydrograph for clarity