Polishing everything before moving on