#JC-1750: Little refactoring