start cleaning things up a bit