#JC-1510 clean code