Auto-formatting: Fixed some issues.