Minor code cleanup...