Fix msftidy compliance