Long overdue minor cleanup