#JC-1210 Refactoring.