Gh375 - merge branch

format code everywhere