Minor commenting and formatting updates