Code reorganiation + Make change