minor format changes, see #6