Fix decimals in displayed price, minor refactoring