Polishing

Polishing to ensure that build goes through smoothly.