StructureBraces - todo in tests
some CS fixes