a tad bit of cleaning up