started cleaning things up a bit