add braces matching feactures and refactor using