addressed Young-Seok's code review comments
4 files changed