-Fix bracket remove in sub strings
-Fix swapping