[enh] Code cleaning