working on cleaning things up