A few minor changes to format