INT-3388: polish code