SNAP-1166 - improved code reformation