Tidy up
Shorten lines
Let the formatter extract formatter pattern from config
Shorten lines