#JC-1268 Refactoring.