Some code polishing.