Nit/style clean-up of first round of merged TTWF Seoul PRs merges.
fixup! Nit/style clean-up of first round of merged TTWF Seoul PRs merges.
Merge pull request #1073 from cynthia/r/ttwf-seoul-cleanup-1

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