Fixed auto-formatting