#JC-1428 Refactoring.