fixup! Nit/style clean-up of first round of merged TTWF Seoul PRs merges.