#JC-1596 clean code