the beginnings of cleaning things up