Started cleaning things up