[new] Code cleaning