#JC-1428 refactoring.