Minor updates
Optimization by mocing trains history data into data loader instead of
store
No change to logic