Minor code polishing