fixed comments and format