Basic refactoring
Fixing bug; Also indexing new commodity price records when fetched