I just cleaned up all the msftidy complaints.