Almost fixed auto-formatting.