comments and formatting updates