PolishDoughnut: again some code cleaning