Minor changes to Count comments and format