[CHORE] Cleanup formatting