cleanup with msftidy