code cleaning / code optimization