PolishDoughnut: again code cleaning