INT-267: Polishing according PR comments