Minor code polishing.