Auto-formatting & imports cleanup