Refactor some CODEZ.