Polishing the code a bit.