#JC-1428 refactoring after review