HG-838
Refactor