Minor changes to format