The beginnings of code cleanup