reindent the comments and add grant setting as requested.