I used the new formatter that has some issues left. I can fix them by hand or leaf them in until the formatter is fixed