Clean-ups
Simplify code for loading data

Use boost function and bind for new generic data load function.