Initial re-former commit
Finish re-former