Auto-formatting + small fixes