Fixed msftidy complaints