Updated comments and format changes only