Sangyong Sim

Refactoring