Updating a few things for cleaner output.