Polishing the code