Long overdue cleanup pass...