fix code re-org