Add country and currency. Clean the code.