Some small recoding