Refactor according to self run-through result.
Refactor according to self run-through result.

google-cloud-japan/egg-training-materials,google-cloud-japan/egg-training-materials,google-cloud-japan/egg-training-materials