[formatter] Cleanup, formatting