Refactor
msftidy