Minor code polish