Some updates to standardize the output.