Split price in amount and currency + minor changes