Cleaning a few things up.
More clean up.