refactor and better curly handling
refactor and better curly handling

paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace,paladox/ace