edited comments and formatting