[Bc_Yokohama_Task3] Refactoring
[Bc_Yokohama_Task3] Done.
Merge branch 'Bc_Yokohama_Task3'