Cleaning a few things up