Add comments and StyleCop-setting changes