working on cleaning things up a bit