Some changes to make output clearer.