Move formatter
Group formatters
Tidy up