#JC-1145:
* Refactor