#JC-1514 Refactoring.