#JC-1504 Code review comments fixed.