final updates based on review comments. msftidy check, module load check.