FLEX-34124 change formatting/code to be in local style
update with recent fix