PolishDoughnut: still code cleaning...