code refactoring.
Merge pull request #36 from jjlee5266/refactor

code refactoring.