Minor updates to format