Code reorganization improved