Polishing up the code.