Fix prices always having null as currency and clean up code