(Minor code cleanup)