Refactor of historical data feed code

Refactored to fix naming compliance, redundancies and removal of left
over code/comments