cleaning a few things up