Working on cleaning things up