Polishing of the code