Changed depth to the base currency; stylistic code improvements