Erdong | #1793 Code refactor.