Fixed msftidy issues