finished cleaning a few things up